Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Tue, 23 Mar 2010 19:32:31 +0000 (20:32 +0100)
committerJan D. <jan.h.d@swipnet.se>
Tue, 23 Mar 2010 19:32:31 +0000 (20:32 +0100)

Trivial merge